Auto merge of #3160 - alexcrichton:rustc-to-proc, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 7 Oct 2016 21:20:26 +0000 (14:20 -0700)
committerGitHub <noreply@github.com>
Fri, 7 Oct 2016 21:20:26 +0000 (14:20 -0700)
Blanket rename rustc-macro to proc-macro

1  2 
src/cargo/util/toml.rs

Simple merge